<html>
<head><meta charset="utf-8"><title>rolling up ice-breaker signups · t-compiler/wg-meta · Zulip Chat Archive</title></head>
<h2>Stream: <a href="https://rust-lang.github.io/zulip_archive/stream/185694-t-compiler/wg-meta/index.html">t-compiler/wg-meta</a></h2>
<h3>Topic: <a href="https://rust-lang.github.io/zulip_archive/stream/185694-t-compiler/wg-meta/topic/rolling.20up.20ice-breaker.20signups.html">rolling up ice-breaker signups</a></h3>

<hr>

<base href="https://rust-lang.zulipchat.com">

<head><link href="https://rust-lang.github.io/zulip_archive/style.css" rel="stylesheet"></head>

<a name="187677829"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/185694-t-compiler/wg-meta/topic/rolling%20up%20ice-breaker%20signups/near/187677829" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Pietro Albini <a href="https://rust-lang.github.io/zulip_archive/stream/185694-t-compiler/wg-meta/topic/rolling.20up.20ice-breaker.20signups.html#187677829">(Feb 07 2020 at 20:37)</a>:</h4>
<p>dunno how <span class="user-mention" data-user-id="116009">@nikomatsakis</span> did it, but I just wanted to post here the way I used to quickly merge a bunch of conflicting ice-breaker signup PRs, if someone else wants to take care of rolling them up:</p>
<ol>
<li>write <code>* merge=union</code> in <code>.gitattributes</code></li>
<li>run <code>for pr in 224 227 228; do git fetch origin pull/$pr/head; git merge FETCH_HEAD -m "rollup merge of #$pr"; done</code></li>
<li>remove the <code>.gitattributes</code> file</li>
<li>run <code>cargo run check</code> and fix eventual merge errors</li>
</ol>



<a name="187677938"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/185694-t-compiler/wg-meta/topic/rolling%20up%20ice-breaker%20signups/near/187677938" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Pietro Albini <a href="https://rust-lang.github.io/zulip_archive/stream/185694-t-compiler/wg-meta/topic/rolling.20up.20ice-breaker.20signups.html#187677938">(Feb 07 2020 at 20:38)</a>:</h4>
<p><code>* merge=union</code> inside <code>.gitattributes</code> tells git to ignore the usual merge strategy and just add both lines in the final output</p>



<a name="187677963"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/185694-t-compiler/wg-meta/topic/rolling%20up%20ice-breaker%20signups/near/187677963" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Pietro Albini <a href="https://rust-lang.github.io/zulip_archive/stream/185694-t-compiler/wg-meta/topic/rolling.20up.20ice-breaker.20signups.html#187677963">(Feb 07 2020 at 20:39)</a>:</h4>
<p>which is wonderful if multiple people are adding themselves into the list, and horrible in possibly every other kind of merge conflict</p>



<a name="187677988"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/185694-t-compiler/wg-meta/topic/rolling%20up%20ice-breaker%20signups/near/187677988" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Pietro Albini <a href="https://rust-lang.github.io/zulip_archive/stream/185694-t-compiler/wg-meta/topic/rolling.20up.20ice-breaker.20signups.html#187677988">(Feb 07 2020 at 20:39)</a>:</h4>
<p>so with that there are no merge conflicts to fix for every PR :D</p>



<a name="188141145"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/185694-t-compiler/wg-meta/topic/rolling%20up%20ice-breaker%20signups/near/188141145" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> nikomatsakis <a href="https://rust-lang.github.io/zulip_archive/stream/185694-t-compiler/wg-meta/topic/rolling.20up.20ice-breaker.20signups.html#188141145">(Feb 13 2020 at 19:28)</a>:</h4>
<p>heh :)</p>



<a name="188141151"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/185694-t-compiler/wg-meta/topic/rolling%20up%20ice-breaker%20signups/near/188141151" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> nikomatsakis <a href="https://rust-lang.github.io/zulip_archive/stream/185694-t-compiler/wg-meta/topic/rolling.20up.20ice-breaker.20signups.html#188141151">(Feb 13 2020 at 19:28)</a>:</h4>
<p>I just resolved the merge conflicts by hand</p>



<a name="188141353"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/185694-t-compiler/wg-meta/topic/rolling%20up%20ice-breaker%20signups/near/188141353" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Santiago Pastorino <a href="https://rust-lang.github.io/zulip_archive/stream/185694-t-compiler/wg-meta/topic/rolling.20up.20ice-breaker.20signups.html#188141353">(Feb 13 2020 at 19:30)</a>:</h4>
<p>I also resolved them by hand :)</p>



<hr><p>Last updated: Aug 07 2021 at 22:04 UTC</p>
</html>